Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y
authorpopcornmix <popcornmix@gmail.com>
Thu, 25 Jan 2018 16:07:23 +0000 (16:07 +0000)
committerpopcornmix <popcornmix@gmail.com>
Thu, 25 Jan 2018 16:07:23 +0000 (16:07 +0000)

Trivial merge